fix(edit_match): prefer literal paths over glob#133
Open
tobwen wants to merge 2 commits into
Open
Conversation
Existing paths with brackets are now treated as literal files instead of glob patterns. Falls back to glob when the path does not exist or validation fails.
Addresses Greptile P2: the Err(_) => true catch-all silently routed unknown validate_path errors to the glob handler. Return false instead so the single-file handler re-validates and surfaces the error. Dead code today (all errors use path_outside_root), zero behavior change.
56ca4d5 to
d3d29eb
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #132
What and why?
Existing paths with brackets are now treated as literal files instead of glob patterns. Falls back to glob when the path doesn't exist or validation fails.
Need help on this PR? Tag
/codesmithwith what you need. Autofix is disabled.Summary by cubic
Prefer literal paths over globs in
edit_matchwhen the path exists on disk, even if it contains [ ] * ? { }. Use glob only when the path doesn’t exist.should_treat_as_glob: prefer literal whenvalidate_pathresolves an existing path; onvalidate_patherrors (includingpath_outside_rootand unknown), defer to the single-file flow so errors surface correctly.Written for commit d3d29eb. Summary will update on new commits.
Greptile Summary
This PR fixes issue #132 by introducing
should_treat_as_glob, which preferentially interprets a path containing glob metacharacters ([,],*,?,{) as a literal file path whenvalidate_pathcan resolve it to an existing path on disk, falling back to glob routing only when the resolved candidate does not exist.should_treat_as_globreplaces the oldis_glob_patterncheck at the dispatch point; it callsvalidate_pathfirst and only returnstrue(route to glob handler) when the literal path is confirmed absent. Bothpath_outside_rooterrors and unknown validation errors defer tohandle_single_file_edit_matchso real errors surface properly.Confidence Score: 5/5
Safe to merge — the change is narrow and well-tested, and the previous thread's fail-safe concern has already been addressed.
The new
should_treat_as_globfunction correctly gates onvalidate_pathbefore deciding literal-vs-glob, three integration tests exercise the key paths, and the earlier reviewer concern about unknown errors being silently promoted to glob has already been fixed in a follow-up commit.No files require special attention.
Important Files Changed
should_treat_as_globto prefer literal path resolution over glob matching when the file exists on disk; logic and error handling look correct.Flowchart
%%{init: {'theme': 'neutral'}}%% flowchart TD A[handle_edit_match] --> B{op == append?} B -->|yes| C[handle_append] B -->|no| D[should_treat_as_glob] D --> E{is_glob_pattern?} E -->|no| F[false → single-file] E -->|yes| G[ctx.validate_path] G -->|Ok candidate| H{candidate.exists?} H -->|yes| I[false → single-file] H -->|no| J[true → glob] G -->|Err path_outside_root| K[false → single-file] G -->|Err other| L[log debug, false → single-file] F --> M[handle_single_file_edit_match] I --> M K --> M L --> M J --> N[handle_glob_edit_match]%%{init: {'theme': 'base', 'themeVariables': {"darkMode": true, "background": "#0d1117", "primaryColor": "#21262d", "primaryTextColor": "#e6edf3", "primaryBorderColor": "#8b949e", "lineColor": "#8b949e", "textColor": "#e6edf3", "edgeLabelBackground": "#161b22", "actorBkg": "#21262d", "actorBorder": "#8b949e", "actorTextColor": "#e6edf3", "actorLineColor": "#8b949e", "signalColor": "#8b949e", "signalTextColor": "#e6edf3", "noteBkgColor": "#373320", "noteBorderColor": "#d4a72c", "noteTextColor": "#f0e6c0", "labelBoxBkgColor": "#21262d", "labelBoxBorderColor": "#8b949e", "labelTextColor": "#e6edf3", "loopTextColor": "#e6edf3", "activationBkgColor": "#30363d", "activationBorderColor": "#8b949e"}}}%% flowchart TD A[handle_edit_match] --> B{op == append?} B -->|yes| C[handle_append] B -->|no| D[should_treat_as_glob] D --> E{is_glob_pattern?} E -->|no| F[false → single-file] E -->|yes| G[ctx.validate_path] G -->|Ok candidate| H{candidate.exists?} H -->|yes| I[false → single-file] H -->|no| J[true → glob] G -->|Err path_outside_root| K[false → single-file] G -->|Err other| L[log debug, false → single-file] F --> M[handle_single_file_edit_match] I --> M K --> M L --> M J --> N[handle_glob_edit_match]Reviews (4): Last reviewed commit: "fix(edit_match): fail-safe on unknown va..." | Re-trigger Greptile